From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 22 Jun 2011 16:25:06 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~844^2~1165^2
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=9f0b1513ad9b24e2f7dec87d3afb32cd6240ccad;p=emacs.git

Merge from trunk.
---

9f0b1513ad9b24e2f7dec87d3afb32cd6240ccad